Skip to content

[8.x](backport #41198) Create nil cgroups reader for processor, improve error handling#41205

Merged
pierrehilbert merged 5 commits into8.xfrom
mergify/bp/8.x/pr-41198
Oct 15, 2024
Merged

[8.x](backport #41198) Create nil cgroups reader for processor, improve error handling#41205
pierrehilbert merged 5 commits into8.xfrom
mergify/bp/8.x/pr-41198

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2024 •
edited by zube bot
Loading

Proposed commit message

Continuation of #41189 . This adds a NilCGReader type that makes us a little less likely to hit a nil pointer deref if this code is changed in the future, and also cleans up some of the error handling.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.
This is an automatic backport of pull request #41198 done by [Mergify](https://mergify.com).

@fearful-symmetry @mergify
Create nil cgroups reader for processor, improve error handling (#41198)
0b886fc 
* create nil reader, improve error handling

* add test, clean up

* linter

(cherry picked from commit 764ba96)

# Conflicts:
#	filebeat/autodiscover/defaults_aix.go
#	libbeat/processors/add_docker_metadata/add_docker_metadata.go
#	libbeat/processors/add_process_metadata/add_process_metadata.go
#	libbeat/processors/add_process_metadata/add_process_metadata_test.go
#	libbeat/processors/add_process_metadata/gosigar_cid_provider.go
@mergify mergify bot requested a review from a team as a code owner October 11, 2024 15:27
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 11, 2024
@mergify mergify bot requested review from belimawr and leehinman and removed request for a team October 11, 2024 15:27
@mergify
Copy link
Contributor Author

mergify bot commented Oct 11, 2024

Cherry-pick of 764ba96 has failed:

On branch mergify/bp/8.x/pr-41198
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 764ba96d34.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/autodiscover/defaults_aix.go
	both modified:   libbeat/processors/add_docker_metadata/add_docker_metadata.go
	both modified:   libbeat/processors/add_process_metadata/add_process_metadata.go
	both modified:   libbeat/processors/add_process_metadata/add_process_metadata_test.go
	both modified:   libbeat/processors/add_process_metadata/gosigar_cid_provider.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 11, 2024
@botelastic
Copy link

botelastic bot commented Oct 11, 2024

This pull request doesn't have a Team:<team> label.

@pierrehilbert
Copy link
Contributor

pierrehilbert commented Oct 11, 2024

@fearful-symmetry could you please fix the conflicts here?

@mergify
Copy link
Contributor Author

mergify bot commented Oct 11, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-41198 upstream/mergify/bp/8.x/pr-41198
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-41198

@mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@pierrehilbert pierrehilbert merged commit 017f613 into 8.x Oct 15, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/8.x/pr-41198 branch October 15, 2024 06:53
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pierrehilbert pierrehilbert pierrehilbert approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr was automatically assigned from elastic/elastic-agent-data-plane

@leehinman leehinman Awaiting requested review from leehinman leehinman was automatically assigned from elastic/elastic-agent-data-plane

Assignees

@fearful-symmetry fearful-symmetry

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@pierrehilbert @fearful-symmetry